Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return of the M37 #443

Merged
merged 35 commits into from
Sep 15, 2024
Merged

Return of the M37 #443

merged 35 commits into from
Sep 15, 2024

Conversation

Max-023
Copy link
Contributor

@Max-023 Max-023 commented Sep 9, 2024

About the pull request

Stinky Dragon(deez nuts across your face) did an oopsie.

Explain why it's good for the game

M37 gucci swag.

Testing Photographs and Procedure

N/A

Changelog

🆑
add: Scabbard and pouch added to the M37 kitbox
add: Kitbox now in the armory like it was intended
/:cl:

Dumbgunner added 30 commits March 27, 2024 15:58
This reverts commit b1f8fc5.
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Doubleumc Doubleumc merged commit 33a3013 into cmss13-devs:master Sep 15, 2024
36 checks passed
cm13-github added a commit that referenced this pull request Sep 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants